projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29858d0 854de28)
Merge pull request #7815 from alexknop/conflictdialogfix
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Tue, 11 Feb 2025 10:14:43 +0000 (11:14 +0100)
committerGitHub <noreply@github.com>
Tue, 11 Feb 2025 10:14:43 +0000 (11:14 +0100)
Fix Height for Resolve Conflicts Dialog


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.